From d3abd83330851dc75ea8f7b9e8c437544d2ea30c Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 31 Oct 2015 19:13:32 -0400 Subject: [PATCH] Adwaita: Fix up color button styling There was one forgotten instance of the GtkColorSwatch type name. --- gtk/theme/Adwaita/_common.scss | 2 +- gtk/theme/Adwaita/gtk-contained-dark.css | 4 ++-- gtk/theme/Adwaita/gtk-contained.css | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index 7108aed880..2b72f7dd14 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -734,7 +734,7 @@ modelbutton.flat, button.color { padding: 5px; // Uniform padding on the GtkColorButton - GtkColorSwatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden by the + colorswatch:first-child:last-child { // :first-child:last-child for a specificity bump, it gets overridden by the // colorpicker style, otherwise border-radius: 0; box-shadow: inset 0 1px 1px transparentize(black, 0.9), diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 4ed6f637a2..07d67dd004 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -1243,10 +1243,10 @@ modelbutton.flat, button.color, headerbar button.color.titlebutton, .titlebar button.color.titlebutton { padding: 5px; } - button.color GtkColorSwatch:first-child:last-child { + button.color colorswatch:first-child:last-child { border-radius: 0; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px rgba(238, 238, 236, 0.1); } - button.color GtkColorSwatch:first-child:last-child:insensitive, button.color GtkColorSwatch:first-child:last-child:backdrop { + button.color colorswatch:first-child:last-child:insensitive, button.color colorswatch:first-child:last-child:backdrop { box-shadow: none; } /********* diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index cee5a74a0f..b177506193 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -1243,10 +1243,10 @@ modelbutton.flat, button.color, headerbar button.color.titlebutton, .titlebar button.color.titlebutton { padding: 5px; } - button.color GtkColorSwatch:first-child:last-child { + button.color colorswatch:first-child:last-child { border-radius: 0; box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px white; } - button.color GtkColorSwatch:first-child:last-child:insensitive, button.color GtkColorSwatch:first-child:last-child:backdrop { + button.color colorswatch:first-child:last-child:insensitive, button.color colorswatch:first-child:last-child:backdrop { box-shadow: none; } /********* -- 2.30.2